From 92b3cda495da1702abf82db39411981d76488f9c Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 21 Oct 2004 19:01:29 +0000 Subject: [PATCH] *** empty log message *** --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkiconcache.c | 15 ++++++++------- 5 files changed, 28 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1313293b74..95a520c443 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2004-10-21 Matthias Clasen + * gtk/gtkiconcache.c: Include io.h on windows. (#156075, + Kazuki IWAMOTO) + (_gtk_icon_cache_new_for_path): Don't use MAP_FAILED if we don't + have mmap. + * gtk/gtkicontheme.c (gtk_icon_theme_has_icon): Implement for cached themes. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 1313293b74..95a520c443 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,10 @@ 2004-10-21 Matthias Clasen + * gtk/gtkiconcache.c: Include io.h on windows. (#156075, + Kazuki IWAMOTO) + (_gtk_icon_cache_new_for_path): Don't use MAP_FAILED if we don't + have mmap. + * gtk/gtkicontheme.c (gtk_icon_theme_has_icon): Implement for cached themes. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 1313293b74..95a520c443 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,10 @@ 2004-10-21 Matthias Clasen + * gtk/gtkiconcache.c: Include io.h on windows. (#156075, + Kazuki IWAMOTO) + (_gtk_icon_cache_new_for_path): Don't use MAP_FAILED if we don't + have mmap. + * gtk/gtkicontheme.c (gtk_icon_theme_has_icon): Implement for cached themes. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 1313293b74..95a520c443 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,10 @@ 2004-10-21 Matthias Clasen + * gtk/gtkiconcache.c: Include io.h on windows. (#156075, + Kazuki IWAMOTO) + (_gtk_icon_cache_new_for_path): Don't use MAP_FAILED if we don't + have mmap. + * gtk/gtkicontheme.c (gtk_icon_theme_has_icon): Implement for cached themes. diff --git a/gtk/gtkiconcache.c b/gtk/gtkiconcache.c index 5175787c7c..03f6f3bf44 100644 --- a/gtk/gtkiconcache.c +++ b/gtk/gtkiconcache.c @@ -24,7 +24,9 @@ #ifdef HAVE_MMAP #include #endif - +#ifdef G_OS_WIN32 +#include +#endif #include #include #ifdef HAVE_UNISTD_H @@ -72,12 +74,13 @@ _gtk_icon_cache_unref (GtkIconCache *cache) GtkIconCache * _gtk_icon_cache_new_for_path (const gchar *path) { + GtkIconCache *cache = NULL; +#ifdef HAVE_MMAP gchar *cache_filename; gint fd; struct stat st; struct stat path_st; - gchar *buffer = MAP_FAILED; - GtkIconCache *cache = NULL; + gchar *buffer; if (g_getenv ("GTK_NO_ICON_CACHE")) return NULL; @@ -114,9 +117,7 @@ _gtk_icon_cache_new_for_path (const gchar *path) goto done; } -#ifdef HAVE_MMAP buffer = (gchar *) mmap (NULL, st.st_size, PROT_READ, MAP_SHARED, fd, 0); -#endif if (buffer == MAP_FAILED) goto done; @@ -125,9 +126,7 @@ _gtk_icon_cache_new_for_path (const gchar *path) if (GET_UINT16 (buffer, 0) != MAJOR_VERSION || GET_UINT16 (buffer, 2) != MINOR_VERSION) { -#ifdef HAVE_MMAP munmap (buffer, st.st_size); -#endif GTK_NOTE (ICONTHEME, g_print ("wrong cache version\n")); goto done; @@ -144,6 +143,8 @@ _gtk_icon_cache_new_for_path (const gchar *path) g_free (cache_filename); close (fd); +#endif /* HAVE_MMAP */ + return cache; } -- 2.30.2